(insert-directory): Handle //SUBDIRED// lines in recursive listings

from ls --dired.

diff --git a/lisp/files.el b/lisp/files.el
index 37118f85d2c21fd7dc9cd76789825801655ced3b..9da9bd87875dd056e3d69376c5c2cfd430b02217 100644 (file)
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4072,6 +4072,9 @@ If WILDCARD, it also runs the shell specified by `shell-file-name'."
 
          (when (string-match "--dired\\>" switches)
            (forward-line -2)
+            (when (looking-at "//SUBDIRED//")
+              (delete-region (point) (progn (forward-line 1) (point)))
+              (forward-line -1))
            (let ((end (line-end-position)))
              (forward-word 1)
              (forward-char 3)